diff --git a/.classpath b/.classpath
index 2079c81..838a207 100644
--- a/.classpath
+++ b/.classpath
@@ -12,10 +12,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-<<<<<<< HEAD
-=======
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
->>>>>>> 14475fcaec8b30c2ab4f67d516c37d8d120c74b1
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/src/main/java/db/Cookbook.java b/src/main/java/db/Cookbook.java
index f2b1743..2089327 100644
--- a/src/main/java/db/Cookbook.java
+++ b/src/main/java/db/Cookbook.java
@@ -75,7 +75,10 @@ public class Cookbook {
             System.err.println("Blad przy wstawianiu przepisu");
             e.printStackTrace();
             return false;
-        }
+        } catch (IOException e) {
+        	System.err.println("Blad buforowania zdjecia");
+			e.printStackTrace();
+		}
         return true;
     }
     
diff --git a/src/main/java/ksiazka/kucharska/RetrieveData.java b/src/main/java/ksiazka/kucharska/RetrieveData.java
index bc5054c..e62be8b 100644
--- a/src/main/java/ksiazka/kucharska/RetrieveData.java
+++ b/src/main/java/ksiazka/kucharska/RetrieveData.java
@@ -47,6 +47,8 @@ public class RetrieveData extends FrmMain{
 		txtDescription.setText(myRecipe.getDescription());
 		txtTags.setText(myRecipe.getTags());
 		imgRecipe.setIcon(myRecipe.getImage());
+		txtDescription.setCaretPosition(0);
+		txtIngredients.setCaretPosition(0);
 		myCb.closeConnection();
 	}
 	public static void addNewRecipe(){